Merge "Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev am: 1bcaa0dd am: 5c55e68d" into tm-d1-dev-plus-aosp