Merge changes I72b87b7f,I19aae3b8 into main am: ae6fdbf847 am: 0696005745 am: 6ae29c6bf3 am: 4d474fbbf7

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

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