Merge "Add @UnsupportedAppUsage annotations"
am: 4c3bf0f36a

Change-Id: I5e0b6dcacb0c15834ccffed2e45628b5092ba1b0