Merge "Fixed to prevent usagestats file corruption when writing" am: 98fc96fc65 am: acb36aadda

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6bf40e6f362f9153cc5331e42af33b814e988d4