Remove @UnsupportedAppUsage annotations.
am: fac614156f

Change-Id: Ia664854607b300532ef324fbb774c52eaf4a524b