tree bfbfce4f94229ff43e0d3c82148172ae67cc0bca
parent 1c67aeb1adcc538da5f4ce5d196b371ba8807ff3
parent 8b5cc29efee9333bc42a9f7cb915569d7f8f860d
author Xin Li <delphij@google.com> 1633656012 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633656012 +0000

[automerger skipped] Merge Android 12 am: 8b5cc29efe -s ours

am skip reason: Merged-In I2c37154b68c732057cb5607034022eb61ef57a0d with SHA-1 1c67aeb1ad is already in history

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

Change-Id: Ia8b04145fb9f83d20c4e0f0b93825b63b5a06ce8