[automerger skipped] Merge "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into sc-dev am: 391cabb10c am: 708c29db10 -s ours am: 7902b42dfe -s ours am: 8a6629d33d -s ours am: b67add484c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19500370 Change-Id: I06125dd533a8883784f8c2e2d733ed55f49a2056 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: