Merge "Fix restore from higher SDKs in SettingsBackupAgent" into pi-dev am: ff25b5f118
am: 44b32fa5ee

Change-Id: I8f0a16f62ad27c53dd143567c02fc006adeab3f8