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

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

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