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

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

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