Merge "Snap for 10285742 from 25f3d0e1e39f866fd1cf7af494c150fd8f281afe to androidx-health-release" into androidx-health-release