[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if...

[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: d4d6b18e -s ours am: a3281827 -s ours am: 4546e81f -s ours am: d0df74d0 -s ours am: 4f5459ab -s ours am: 04aefce0 -s ours

am skip reason: subject contains skip directive

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



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