Merge "Add @UnsupportedAppUsage annotations"
am: b40b37910d

Change-Id: Ic3de9e4c6d17687d4a1f64c02026e5c0711e8fd1