Merge "aconfig: add @UnsupportedAppUsage to methods in generated flags" into main