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

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



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