[automerger skipped] Merge "Merge "Change AtomicFile to use...

[automerger skipped] Merge "Merge "Change AtomicFile to use rename-into-place." into rvc-dev am: 0d23267a am: 37f0ad1b" into rvc-d1-dev-plus-aosp am: f42be250 -s ours am: 756f87ec -s ours

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

Change-Id: I888fa7fd95b5e9e60cf3779f1caaf4211d70ee89