Merge changes Ib70a8498,I06f7450c into main am: d53c1a7b62 am: 974ed3575d am: a26f48a760 am: f62cc296a1

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

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