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 am: 38221194

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



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