Merge "Merge "[automerger skipped] Merge "[DO NOT MERGE]Fix PermissionsHostTest#testNoResidualPermissionsOnUninstall is failing on Baiji (and maybe other Android P based watches)." into pie-cts-dev am: ce5675d0df -s ours am skip reason: subject contains skip directive" into android10-tests-dev am: 22a605c4bd -s ours" into android11-tests-dev