Merge "Add @UnsupportedAppUsage annotations"
am: 315404a9a5

Change-Id: Ic6969243ca77124ff2063359c341969d01eeb7d9