Merge "Add @UnsupportedAppUsage annotations"
am: 78f8ffbffd

Change-Id: Ifb26fbc34dec7135fb40dc98303ce9996ba79375