Merge "Add @UnsupportedAppUsage annotations"
am: 3b358c7c6d

Change-Id: Icf2ad38a9fa29338c8252c2bf99c47435ef18418