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

Change-Id: I29ad66a3772feff0e881d680de7eb9c87aef9f45