Merge "Revert "RESTRICT AUTOMERGE Android Q is API 29"" into qt-dev
am: 40a8e99740

Change-Id: I1e2472a230baae25c2abe070a0ec75b9a8319c06