Merge "SDK Platform and Build tools Version bump for Android Q Beta4 Bug: 131242083 Test: N/A" into qt-dev
am: 945100c575

Change-Id: If9529f3e58ab1e72f65e4b11cbbd2de55d17b4ae