Merge "Add @UnsupportedAppUsage annotations for max-p."