[automerger skipped] Merge Android 12L am: b38088bcec -s ours am: 412d4be072 -s ours

am skip reason: Merged-In I6cd2e61445edf190a0fff7008d154eb4fd366f21 with SHA-1 022f2d1d4a is already in history

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

Change-Id: Ic5efda81f4034363364070d7dbc41fc2dd9fae70