Merge changes I16bd2d5e,I04e9bf73 am: 6776e645f1 am: 459874ffe6

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

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