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

DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap am: 17d67458 am: d6f45761

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



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