Merge "Add @UnsupportedAppUsage annotations"
am: 792fb35cee

Change-Id: If9bbbd7c2011e067b79b81f8fe1c785772db56cf