[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-v2-dev am: 6c7ca7e183 -s ours am: 22e6321905 -s ours am: 226334a2dc -s ours am: d9623d86e2 -s ours am: edd2f1926f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500530 Change-Id: I1ea7eece7e06a5b8dc27344b5724c18778fadc5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: