Merge "Add @UnsupportedAppUsage annotations"
am: f304f4d2ea

Change-Id: Ic5e5148c473e64bc5d8ff506e7f4ac78c409734c