Merge "Dismiss lingering volume dialog" into udc-dev am: aba85c44 am: 0be142ed

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



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