Merge "Add @UnsupportedAppUsage annotations"
am: 10c573ff85

Change-Id: I394e53a553e4c054c52fb3e991b4f81f3c152a94