Merge changes I82ac2392,Ie0dd7acd,I8018e48f am: bf18673dee am: 10b72db477

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

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