Merge "Fix a bug where MenuItems would not return consistent results for item icons initialized from a drawable resource id."

Author: adamp

core/java/com/android/internal/view/menu/MenuItemImpl.java

@@ -382,7 +382,10 @@ public Drawable getIcon() {
         }
 
         if (mIconResId != NO_ICON) {
-            return mMenu.getResources().getDrawable(mIconResId);
+            Drawable icon =  mMenu.getResources().getDrawable(mIconResId);
+            mIconResId = NO_ICON;
+            mIconDrawable = icon;
+            return icon;
         }
 
         return null;