Merge SP1A.211205.008 am: 72ce3c56cb

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

Change-Id: Ia988eeeb2436421bbc2ec5e68bc427dc44f03741