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

Bug: 189946434
Change-Id: I5553d2b8058ed66bc38776e38a326bb42305aa82