Merge "Increment platform-tools version to 30.0.4." am: f942ac7893

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

Change-Id: I9ec4a6e67b318c47ef0ff368c63657a4fdea5aa5