Merge "Bump platform-tools version number" am: f3a4f3f966 am: 585e33ba5c

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

Change-Id: I5f23c01a1ece86e57e9af5f5cba4df6b2022a7cc