Merge "[automerger skipped] Merge "API: Explicitly track incompatibilities with previous API versions" into qt-dev am: d3b53e080d am: 1ac726e718 -s ours am skip reason: change_id I1f17b57705e2f7350b55ab278e06fc4e988771ff with SHA1 9597f8c84f is in history" into qt-r1-dev-plus-aosp