Merge "libtimeinstate: tolerate multiple calls to startTrackingUidTimes" am: ba879c75bd am: 7ae4bc7d92 am: 35a5e3b93d

Change-Id: I80f5b1cc7f2e1de7f8152c912b173cd00280421b