Merge "Add @UnsupportedAppUsage annotations"
am: f892a8ce9f

Change-Id: I34b238c2105ea4f46c1cbdbc4b2e4375562398f1