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