Merge changes I98f17636,I11f6946d into main am: 3bac53cc51

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

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