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

[automerger skipped] [conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160c am: 0a761a95 -s ours am: 6732f330 -s ours am: 6bfd59aa -s ours am: c0994ae1 -s ours am: a9c783ef -s ours am: 6e1514c3 -s ours

am skip reason: subject contains skip directive

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



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