Merge "Add publicAlternatives to @UnsupportedAppUsage" am: f65dbf1269
am: c7fd1eaf68

Change-Id: I02adca86bc37638702b04257ff0326ec8bf8cdc0