[automerger skipped] Merge 24Q4 into AOSP main am: 3e593c00f3 -s ours

am skip reason: Merged-In I515e9162fb134a4de44f0503cd161575a8126f73 with SHA-1 cf937d5ddf is already in history

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

Change-Id: If0764822bb88c144be18778b474091902374d8cf
Signed-off-by: Automerger Merge Worker <[email protected]>
tree: 16478d73ce450495cbf1572f65e4cd02fd3b47c5
  1. .prebuilt_info/
  2. 10/
  3. 12/
  4. 13/
  5. 15/
  6. 7/
  7. current/