Merge "[automerger skipped] Merge "Explicitly track incompatibilities with previous API versions" into qt-dev am: 8a7db027c1 am: 7feb4a1b29 -s ours am skip reason: change_id I3d9e78357f4d91b702d321eb1ce1e71bb90e478b with SHA1 6c5e17e3bf is in history" into qt-r1-dev-plus-aosp