[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into qt-dev am: e893eff6f2 am: dc45b9fed3 -s ours am: 0f8fc1a47e -s ours am: e0cb2beeae -s ours am: 191abef1fa -s ours am: 108fb60e32 -s ours am: 516b24e8bd -s ours am: ebcf70b06f -s ours am: f0c41b828c -s ours am: 5d5b5196db -s ours am: 9305759186 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410
Change-Id: I7a50f0fca7b5c008f7e87b49ed58b7f963214986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>