Merge "Add hidden API putPhoneIdAndMaybeSubIdExtra" into main