Merge "Add @UnsupportedAppUsage annotations"
am: 3b89584a7e

Change-Id: I65a52e7ed92b09f7bf5c83eb0007f217ee5eaf6b