Merge "Add @UnsupportedAppUsage annotations"
am: 14dea1f70c

Change-Id: Iafa0f35414245b10ef83299f66331c6a3abc379c