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

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

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