Merge "Add @UnsupportedAppUsage annotations"
am: 9513a9e215

Change-Id: I347d6893209c55b6e6029034db1b42957f27306a