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

Bug: 189946434
Change-Id: Icadbb4c5154e2799060a53b1b52b9f0e58b42c96