Merge "Dismiss lingering volume dialog" into tm-qpr-dev am: e0f91b9e am:...

Merge "Dismiss lingering volume dialog" into tm-qpr-dev am: e0f91b9e am: 62694e7d am: 22d2c699 am: c3a2715c

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



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