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

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

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



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