Merge "Prevent deadlock for clearWaitingDialog" into tm-dev am: e880b639cf am: 7015800dfd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030448 Change-Id: If94bd7c3d8b15db432c9761961bcd710c8bded0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: