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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd140356f26f89fa8b182946cde729f2fb0df490