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

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

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