[automerger skipped] Merge Android 12 am: e038828f40 -s ours am: 7797335e87 -s ours am: 6a3163bbc9 -s ours

am skip reason: Merged-In Ib2789a2c95f5cfc1d295a53b9f24f258723a2d74 with SHA-1 c651276f9c is already in history

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

Change-Id: I2755ac80e8734712584594e084df533d6e141ecd
tree: b3f26ba0f712af483f6e1ad3459b17ced377632c
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS