Needed in support of b/301215854 am: ae2bdf69 am: 63b036e0 am: 540c10f3 am: e1c08f4b

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



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