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

Merge "Dismiss lingering volume dialog" into udc-dev am: aba85c44 am: 3485e1af am: 9ac374e7 am: 804fd599

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



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