aml_hef_341512030 (11392463,com.google.android.healthfitness)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: I86da15672ef4961ea4910d2f97e29d67973c5fe9