Merge changes I16bd2d5e,I04e9bf73 am: 6776e645f1

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

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