Revert "r1.2 update changed backup registration, temporarily revert the changes and fix market restore"

This reverts commit 2a548435a5a7dc46595cfff8c5e3852217af8e01.

Revert "Revert "Harden against transiently unavailable backup transports""

This reverts commit 5d5caae98f3e533eb242a18c749e5a15267adce0.

New gapps from 4.4.1 fix the back up issue

Change-Id: Ie8235fb278530d88e9a533e5ccf7ce453b52d5a0