Merge changes from topic "am-e06fd6bc4686461e856b869e6648426a" am: 144bb9fd...

Merge changes from topic "am-e06fd6bc4686461e856b869e6648426a" am: 144bb9fd am: 4187e800 am: fa359aea am: b581b18a am: bf3262de

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



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