[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 89ac95017f am: b2b309516a am: 6ccab09668 -s ours
am skip reason: Change-Id I534e3fd1305e2f4af076986770033478448a665c with SHA-1 afdb23ab6f is in history

Change-Id: Id70ece52187bd4db1689c7f9fb7098308f5fbe41