Merge "Don't create copies of Icon bitmaps for Smartspace" into udc-dev am:...

Merge "Don't create copies of Icon bitmaps for Smartspace" into udc-dev am: 8984c11c am: 4ced56ad am: 62f83017 am: ebbacee5

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



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