Merge changes I1625d1a6,I2db9cfa2,I59c31318,Ic0ed1a8d,I612374bb into main am: 83ebc4376d am: b19326fbad am: dff3daad7a

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

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