Merge changes from topic "am-e06fd6bc4686461e856b869e6648426a" am: 144bb9fd77 am: 4187e800db am: fa359aeacb

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

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