[automerger skipped] [automerge] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q 2p: 23aac9cb8e am: 75ed22a797 -s ours am: f02d6d9320 -s ours am: 1d184708e2 -s ours am: 8bb87318a7 -s ours

am skip reason: subject contains skip directive

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

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