Several preferences lost during P->Q B&R

SettingsBackupAgentduring restore doesn't account for the fact that some settings that were store in Global on source have been moved from to Secure. Fix it.

Bug: 137948683
Test: 1. Do cloud B&R P->Q and ensure settings are restored
      2. atest SettingsBackupTest

Change-Id: Iefe451a7b3dd0ea1d4cb95a56a71cc3341b65d7c