Merge "Add @UnsupportedAppUsage annotations"
am: 35ba945c50

Change-Id: Ief65c4b1d3842f8d9c170545d6e271ef293fa6ba