Merge "[DO NOT MERGE]Fix PermissionsHostTest#testNoResidualPermissionsOnUninstall is failing on Baiji (and maybe other Android P based watches)." into pie-cts-dev