Merge "Add @UnsupportedAppUsage annotations" am: 35ba945c50 am: 582d18c02b
am: 9f0aff0d98

Change-Id: I5ad5d586548bb5e94b4b2be7c3ab0e15a062dd3d