Merge "Prevent deadlock for clearWaitingDialog" into tm-dev am: e880b639 am: 7015800d am: 82b85eaa

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



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