Merge "Dismiss lingering volume dialog" into udc-dev am: aba85c44 am: 7657bcbe

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



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