Merge "Prevent deadlock for clearWaitingDialog" into tm-dev am: e880b639 am: 73ece4c4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030448



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