Merge "Prevent deadlock for clearWaitingDialog" into tm-dev am: e880b639cf am: 7015800dfd am: 82b85eaa66
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>
This commit is contained in: