[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." into qt-qpr1-dev-plus-aosp am: 4666dc1d5c -s ours
am skip reason: Change-Id I6ab53570aca580fbee1fcc927871caa09780f58f with SHA-1 e23a0eb5ee is in history

Change-Id: I482a10562741c2d0fdf9f36ff64083447a5c2d3f