Merge "Add @UnsupportedAppUsage annotations"
am: 88e2a9aaee

Change-Id: I63ae22279aa46522b652cdc9329567a04a7ef136