Merge changes Ibb1f2b72,I96e19758 into main am: 5361fbef34 am: 4ab79f0993 am: 48633cf8e0

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2680157

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