[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am:...
[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 16c94880 am: 080950f8 -s ours
am skip reason: Change-Id Icc86857773402b80d5204f24e6fdc49e5377d54a with SHA-1 984bf104 is in history
Change-Id: I3c2880bcc189f5deb8985ad20da53300ac23197c