Merge changes I264d0891,I1af733e7,Iae344c1e am: 71d9f3607b

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

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