[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: b2c3eaaf10 am: 904b7f9de2 am: 62dba7a4e6 -s ours
am skip reason: Change-Id I547d7fb2e6bc2e9707bbc0d14dc1e8cd632c5a23 with SHA-1 74cb719964 is in history

Change-Id: I15db1f674a82e236290d22579bb383820ebedac4