Merge "Revert "Revert "Android Q is API 29""" into qt-dev am: a326dfb1e5
am: 203ac63ea6

Change-Id: Ie8de73de0fae8fe9cd044b122f8733f283662f3c