Merge "Updating Android Platform and Build Tools Version number for Android P DP4/Beta2 release Bug: 109675113 Test: N/A" into pi-dev