aml_hef_341114030 (10906182,com.google.android.healthfitness)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iae315840f4dac902784fd14ee085f59dd0c7666b