[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am:...

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 04cf215f -s ours am: cc413b8e -s ours

am skip reason: Merged-In I06f4e253db4bdd559542f6ae16556c677845a5a4 with SHA-1 36634ed3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/module_sdk/StatsD/+/20955568



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