[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am:...
[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: e1432f59 am: bf8cb00a -s ours am: e0213692 -s ours
am skip reason: Change-Id I6ab53570aca580fbee1fcc927871caa09780f58f with SHA-1 507c127f is in history
Change-Id: I69dc595ed7241475257e3cdc5270b7b8a849eea4