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

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

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