Merge "Add @UnsupportedAppUsage annotations"
am: 72982a5404

Change-Id: Ia63f22895e02ad24d04cfdda4327535bd2710a99