Merge "Add TwoTargetPreference to Health Connect"