Merge "Fix auto-grant of AR runtime permission if device is upgrading from pre-Q" into tm-dev