[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 70a89435e7 am: 4220fc33a1 am: 627480d918 -s ours
am skip reason: Change-Id I41e12e425284e74561c6b61663241df364ae54a1 with SHA-1 ed5a6ae7ae is in history

Change-Id: Ideb577455679c226bc42eb5c47ed9a4d92329931