Merge "Merge "Clean up temp AtomicFile files" into rvc-dev am: d9705147 am: 5b8bf383" into rvc-d1-dev-plus-aosp am: c58206dd

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

Change-Id: I4efee0b554ac370e4693f029cb09f50bb4b079a7