[automerger skipped] Merge SP1A.211205.008 am: 72ce3c56cb am: d10f798607 -s ours

am skip reason: Merged-In I9a138cdc4cf2767f35b6ccd7a57b892f6fb2dbb5 with SHA-1 58273febd9 is already in history

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

Change-Id: I1fe376a6c14b255b25d0900591570586a15500cd
tree: 88edad1a36fe87f0032ce3aa226b32bf68adccae
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS