Merge "Add publicAlternatives to @UnsupportedAppUsage"
am: 2ac6496fb8

Change-Id: I73939680b531f32e54e62e7f50f7d75d364eefda