Merge "Add @UnsupportedAppUsage annotations"
am: fa4ccace61

Change-Id: Ib61dbedb60054bdf6e21b236f6ad9804465d29c8