Merge "Dismiss lingering volume dialog" into tm-qpr-dev am: e0f91b9e48 am: 62694e7d98 am: 990bb3d5b1

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

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