Merge "Add @UnsupportedAppUsage annotations"
am: eabac25941

Change-Id: I0339d9a93dff74da8eeca239003abd5dd092d16d