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

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

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