Merge "Add @UnsupportedAppUsage annotations"
am: 09426de69d

Change-Id: I8be4fa32c92a5b5ac335bfbfa0a6edffcb881b22