Merge "[Output Switcher] Adjust check for advanced icon" into tm-qpr-dev am: 89bef839

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



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