Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into...

Merge changes from topic "am-6f9e4022de18455493ebda8b0cfe7548" into udc-d1-dev-plus-aosp am: 3e3a65ff

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/24075338



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