[automerger skipped] Merge "Merge "Change AtomicFile to use rename-into-place." into rvc-dev am: 0d23267a9c am: 37f0ad1b43" into rvc-d1-dev-plus-aosp am: f42be250eb -s ours

am skip reason: Change-Id I5c4c438526a2aecdd2af18f71e16b41a05817c61 with SHA-1 b1a7706716 is in history

Change-Id: I5a34e947d7c5f05cf9822f02ac9f92967fa8a589