[automerger skipped] add waitForIdle(timeout) am: a4f5f21095 -s ours

am skip reason: Merged-In I107c5a3e2c9e3fce6f68e6cefba0c6133bd547d0 with SHA-1 87bfaa7868 is already in history

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

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