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

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



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