Merge changes I82ac2392,Ie0dd7acd,I8018e48f am: bf18673dee

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

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