frc_340819190 (10894928,com.google.android.healthfitness)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: I4ae1ca81e08698e14cee35187ddf06710a4a3902