Merge "Merge "Change AtomicFile to use rename-into-place." into rvc-dev am: 0d23267a9c am: 37f0ad1b43" into rvc-d1-dev-plus-aosp