Merge changes Ibb1f2b72,I96e19758 into main am: 5361fbef34

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

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