[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: f55db426 am: f1031ab9 am: 9991eb70 -s ours

am skip reason: subject contains skip directive

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



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