Merge "Add publicAlternatives to @UnsupportedAppUsage"