Merge "CTS: Add @hide annotations to several @IntDef elements" into nyc-dev