[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: f892a8ce9f am: 7a10fd6a47 am: 634676e2f9
am: 8a810b59b7  -s ours

Change-Id: I3eed5d9f0bd2d1fa2e43351c8e23b3a6fcabc9bb