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

core/java/android/app/smartspace/SmartspaceAction.java

@@ -348,6 +348,10 @@ public final class SmartspaceAction implements Parcelable {
          */
         @NonNull
         public SmartspaceAction build() {
+            if (mIcon != null) {
+                mIcon.convertToAshmem();
+            }
+
             return new SmartspaceAction(mId, mIcon, mTitle, mSubtitle, mContentDescription,
                     mPendingIntent, mIntent, mUserHandle, mExtras);
         }

core/java/android/app/smartspace/uitemplatedata/Icon.java

@@ -171,6 +171,7 @@ public final class Icon implements Parcelable {
          */
         @NonNull
         public Icon build() {
+            mIcon.convertToAshmem();
             return new Icon(mIcon, mContentDescription, mShouldTint);
         }
     }