Merge changes I732e5b8a,I4271909e am: b9d8e8289e

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

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