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

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

Change-Id: I1863dd95ae5c2a4ff88ad4f78d8557de89038976