[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: e1432f59ee am: bf8cb00aec -s ours
am skip reason: Change-Id I6ab53570aca580fbee1fcc927871caa09780f58f with SHA-1 507c127f69 is in history

Change-Id: I53394dde4e2801dd85d3abbf73038d8d3daa6364