Merge "[Output switcher] dismiss dialog when launch bt page in lock screen"...

Merge "[Output switcher] dismiss dialog when launch bt page in lock screen" into tm-qpr-dev am: 30acb76f

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



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