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

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

Change-Id: I8586ef8a3a2814191a1cc0fe1bf5629a4d717d42