Merge changes I819eb60a,I48a52aa0,Iab04742c into main am: 5d5906fb02 am: f4b2620436

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

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