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: b0a1705f am: cf299ac5

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



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