Merge "Revert "Revert "Icon: make Icon's Bitmaps immutable""" into tm-dev am:...

Merge "Revert "Revert "Icon: make Icon's Bitmaps immutable""" into tm-dev am: edea3fd4 am: 8bf6ebe1 am: 51edb83c

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



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