Merge changes Ib70a8498,I06f7450c into main am: d53c1a7b am: 974ed357 am:...

Merge changes Ib70a8498,I06f7450c into main am: d53c1a7b am: 974ed357 am: a26f48a7 am: f62cc296 am: 567c88ee

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



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