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

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



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