Merge "libtimeinstate: tolerate multiple calls to startTrackingUidTimes"