Merge changes from topic "am-21021e63687c4f87a5f7335ff8fb0483" am: 844c30f06d am: 8a453b99aa

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

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