[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am:...
[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 9938c70f am: 1f8ff9d3 am: 1e7a3e81 -s ours
am skip reason: Change-Id I288969b0c22fa3a63bc2e71bb5009fe4a927e154 with SHA-1 df439599 is in history
Change-Id: I3f9d26ac9c3ef27f3ad10a8bdf04c820ba8a470f