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

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

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