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: d776f279 am: 00f54eeb am: fe9417cd

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



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