tree 8ca4be5939da44d57859b14f2a7ddcb5e09bdc2d
parent 11c115df2a0cea757714176f67fafc7d6bb18f81
parent 1c46611d2d722d03f969efac7ce55e640a5337e5
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1685068869 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1685068869 +0000

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