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

Merge "Prevent deadlock for clearWaitingDialog" into tm-dev am: e880b639 am: 7015800d am: 591cacc6 am: 89fe0ac2

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



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