[automerger skipped] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: f11f26c0 -s ours

am skip reason: skipped by user olekarg

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



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