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: 3a63adf1

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



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