Merge changes from topic "am-fa85b6b9b1194aefa001f4b793bb9516" into android11-tests-dev

* changes:
  Merge changes from topic "am-87b03182562a4aeca1d7134b28abe4ab" into android10-tests-dev am: 8e9c30ca5b
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Add test support for a new permission to launch the permission manager settings page without granting grant/revoke permission access." into pie-cts-dev am: ddfafd0f0f -s ours am: 05b88c32ba -s ours