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

Change-Id: I03c7411b9a2317403d6165472e3e46a0c5e0b0ee