Merge "Add @UnsupportedAppUsage annotations"
am: f336c03135

Change-Id: Iae7c937caa23432a3851137f6234d0de19a3ed0c