[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 9395887931 am: 8081ee1b35 am: 59d58f5cae -s ours
am skip reason: Change-Id I0c336de56bc4a041dc97ff9b7927f62f0b44b457 with SHA-1 269580069b is in history

Change-Id: I5d5027d9a3ae3c7451b5bff629c0af0902b78a32