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

Merge "Revert "Icon: make Icon's Bitmaps immutable"" into tm-dev am: 4e8c47ef am: cd3ac5bf am: b68c1920

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



Change-Id: I6cb81d8ffb84cce1b84199f397572ec936428306
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>