Merge "PollFor permission state to change to reduce flaky tests" into tm-mainline-prod am: 94f9d86aca

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/21404165

Change-Id: Iea529e283b656f669b81f5b9fa28a7a1bfbdd4d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>