Merge "Add @UnsupportedAppUsage annotations"
am: fd07385fea

Change-Id: Ia1da54fe988be50fe42b1cdc5a3f172c0f617b01