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

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

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



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