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

Bug: 189946434
Change-Id: I474c92d7fe1e29a925ff8cda47649d9a2ae13219