Changes for D2D transfer bugs.

This fixes the backup side bug in first grant time backup and also
renames the backup db file to prevent the merge on the restore side from
happening.

Bug: 290172311, 301925553
Test: N/A
Change-Id: I8838fca29da9568e401dd5379ef2ec097a04ba7a
4 files changed