Merge "Remove unnecessary UnsupportedAppUsage annotation"