Merge changes I43d482c6,I9eae1a09 into main am: 00355dd348

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

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