Merge "Update how UsageStats timestamps are written to disk." into rvc-dev am:...
Merge "Update how UsageStats timestamps are written to disk." into rvc-dev am: abe10376 am: 5693a1d5 am: ebca4d64 am: a228e3e8
Change-Id: I15cb61ca888728f918f5af3adc39c736f60892aa