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

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



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