Merge "Update how UsageStats timestamps are written to disk." into rvc-dev am: abe1037650

Change-Id: I3cd6cd2cd894c740315eb55a13996d01853480b7