Merge "Add @UnsupportedAppUsage annotations"
am: 6d891937a3

Change-Id: I919b9dddda7d848dc96c83d0cfb0aa4e3179fb12