Merge "Increment platform-tools version to 30.0.4." am: f942ac7893 am: 0ab3cd7dc6 am: 005253a131 am: 7fb9fb7a06

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

Change-Id: I7d8e11ab418053c3d7bdeece2f2e6a470ac7e8fa