[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." into...
[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." into qt-qpr1-dev-plus-aosp am: 921be267 -s ours
am skip reason: Change-Id Icc86857773402b80d5204f24e6fdc49e5377d54a with SHA-1 6c93d551 is in history
Change-Id: Icdf67655ac986c6bab6ea968109068381f84552f