Merge "Use new UnsupportedAppUsage annotation." into qt-qpr1-dev-plus-aosp