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

Change-Id: I0674668835cd5a281e8a01c4b5bdb870595a8305