Merge "Add @UnsupportedAppUsage annotations"
am: e84b5dc01f

Change-Id: I33432f9976ef4e41a35a3f6e78b274dc347d0ecc