Merge changes Ia1fc0203,I81b4274d into main am: d37b843c59

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

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