Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap" into tm-dev am: d0225df023
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492582 Change-Id: Ia5d8ea2a1833f1fcdc0683472e6d9e82ff7e0fb9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: