Merge "Add publicAlternatives to @UnsupportedAppUsage"
am: f65dbf1269

Change-Id: I441ba9cb7f006ea2a51d9977b6d25f184873bb9f