Merge "Simplify waiting for UI to show/be gone" into udc-mainline-prod am: eb856b75

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/24282389



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