Merge changes Iae1cbfcc,I4466838c,I19c75e50,I2f49fab1 into main am: 569db94fa8 am: 2a0958b18f

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

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