Merge changes Iedc94613,I58621281 am: 811eed3bb6

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

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