Merge changes from topic "am-e9cc26aa52074db0a6d764cfe3878879" into main am: 35dccce0a7 -s ours

am skip reason: Merged-In I401b091e27e7b3ae86f003a270b53be4060c922f with SHA-1 b347fdbef6 is already in history

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

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