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

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



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