[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 5e9d0685dc am: 1f8ff9d305 am: 1e7a3e8160 -s ours
am skip reason: Change-Id I288969b0c22fa3a63bc2e71bb5009fe4a927e154 with SHA-1 2e1ad6ef00 is in history

Change-Id: I3f9d26ac9c3ef27f3ad10a8bdf04c820ba8a470f
tree: 9a819a64c621169883f3eeb0fc9c6ec9f47438f5
  1. Tethering/