[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." into qt-qpr1-dev-plus-aosp
am: 5a4d191c -s ours
am skip reason: change_id Icc86857773402b80d5204f24e6fdc49e5377d54a with SHA1 6c93d551 is in history
Change-Id: If04d00812a3763cf603df93dd61bdc762f49103b