Merge "Add @UnsupportedAppUsage annotations"
am: 058b566f90

Change-Id: I982201ecfc2f257ff5509de10a73549ebe657aff