Merge cherrypicks of ['googleplex-android-review.googlesource.com/24054814'] into udc-release. am: 9907cac3cc

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

Change-Id: I816cbde15c4abbcd39dedb47d3980276e4f0ea19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 015c93bf29d679c578853c8728671e1a21ce56fd
  1. .prebuilt_info/
  2. 7/
  3. current/