[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: dd48aab8 -s ours am: 4415b0ba -s ours am: e76c6c1b -s ours am: c9c7a741 -s ours

am skip reason: subject contains skip directive

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



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