Merge changes Idd1c8c0e,Id1dc2dc5 into main am: 40408c9d86

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

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