Merge changes from topic "am-21021e63687c4f87a5f7335ff8fb0483" am: 844c30f0...

Merge changes from topic "am-21021e63687c4f87a5f7335ff8fb0483" am: 844c30f0 am: 8a453b99 am: 06746988 am: e32193be

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



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