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

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

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