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

Change-Id: Ie4f284aff9f051bc384087ed72d9000bd641c8aa