Merge "Add @UnsupportedAppUsage annotations"
am: 722dff1f35

Change-Id: I559e8abb355a41119d9cd86a497fbdbd69157f9b