tree 8b5c85a342e15e964637c9d32f305568bf8fbb7b
parent 04aefce04321adcfa370d3df0da99524911c9cce
parent 8a092df896a5bb4d866a70471fa72ec284014503
author Ganesh Olekar <olekarg@google.com> 1661370717 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1661370717 +0000

[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into rvc-qpr-dev am: 29a03aa05c -s ours am: 706fdb063a -s ours am: 9d383010c5 -s ours am: 9fc3dfe456 -s ours am: 8a092df896 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19125908

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