Merge changes I138f3ace,I19f7fc51 am: b8304d1502 am: ef7cc54e9c am: de05fe1d49

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

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