Merge "Revert "RESTRICT AUTOMERGE Android Q is API 29"" into qt-dev