Add hidden API putPhoneIdAndMaybeSubIdExtra

Makes it easier to log subId besides phoneId, as the previous putPhoneIdAndSubIdExtra doesn't expose the subId.

Flag: NONE - adding a hidden API with minor refactor
Bug: 349680971
Change-Id: I5d31c7969c961216d45fd384f72b81589eacee79
1 file changed