Merge "Platform tools 33.0.4: rev bump" am: c3e0908508 am: 17008c1ce2

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

Change-Id: I23cf1cbb61a6e379ae256122c70aac54948bec43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>