Merge "Bumping version number for next release of Platform tools Bug: 217422919 Test: N/A" am: 847b63f48d am: 25e765a8f6 am: 81d5a8c81a

Original change: https://android-review.googlesource.com/c/platform/development/+/1965728

Change-Id: Id8ecd4b27f95f15a0a937074f951ccd1b23901d2