[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ada68acde7 -s ours am: 46718528e2 -s ours

am skip reason: Merged-In I2755ac80e8734712584594e084df533d6e141ecd with SHA-1 16fcd98dcb is already in history

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

Change-Id: I98bc505f91414c8911eaaee43bb8289df3007dbf
tree: 4672a46b0ab1c18ec65d7e17510d081be7bf498c
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS