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

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

Change-Id: I3e618e31c70a854c202240c176c617302f76f94f