Merge "Using android Q sdk in gradle" into ub-launcher3-master