Merge changes I732e5b8a,I4271909e am: b9d8e8289e am: 73d171ff83

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

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