Merge "Add @UnsupportedAppUsage annotations"
am: 2bbb9c537e

Change-Id: I8daf2a9def4453a0aac1f747518962d49b17a9e8