Merge "Add @UnsupportedAppUsage to methods known to be used by apps"