tree 7e43d2149a4596e33e92bc245359331ff1d7ec87
parent b4800202eab29240a945605a38435422b5b6adbf
parent 07dab0c6858d4c87383bec11cef48e91e49bbae2
author Ganesh Olekar <olekarg@google.com> 1660562785 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660562785 +0000

[automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc am: 0a761a9510 -s ours am: 6732f3304f -s ours am: 6bfd59aabf -s ours am: c0994ae1c9 -s ours am: 5d8583773a -s ours am: 2e886b1bbc -s ours am: 07dab0c685 -s ours

am skip reason: subject contains skip directive

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

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