[automerger skipped] [automerged blank] DO NOT MERGE Fix auto-grant of AR...

[automerger skipped] [automerged blank] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q 2p: 23aac9cb 2p: 3ea7195f am: fc30f298 am: 2b74e072 am: 6bdf9f84 am: 24daf691 -s ours

am skip reason: subject contains skip directive

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



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