Merge "Add @UnsupportedAppUsage annotations"
am: 3610ca221d

Change-Id: Icbb3180c485bd20104e30b5c4fefc5b5d80eb4e8