Merge "API Review: Add @IntDef and other annotations to Menu Item flags." into nyc-dev