[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 70129fc863 am: fe3063fb71 am: b615fa46c9 -s ours
am skip reason: Change-Id I8789f8499d4dca08580672e9e45ed9a7026dd686 with SHA-1 c895b1b450 is in history

Change-Id: I834646d326b8f591802cf35f38cc1bb2b4e753d5