Merge cherrypicks of [17605899] into rvc-platform-release. am: cef637a4fb

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/17844779

Change-Id: Ia9798976e61df61692416ab134f47efff07b06f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>