Merge "Add @UnsupportedAppUsage annotations"
am: 3d05f769a3

Change-Id: Id21c0f5dee82e2f2174d795763420bfed806a17b