Bug: 146550929 Test: atest SettingsBackupTest Change-Id: I48c255a4e8999be903e5642ca6d7b312b214d05f
f2c0f4aadf
cde927c935