Merge "Add @UnsupportedAppUsage annotations"
am: 348a7e7315

Change-Id: I8d7b256e64879be2804a851cefa74753b31f496b