Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation...

Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap" into tm-dev am: d0225df0 am: 3cfcba7c am: 27d5f19c

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



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