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

Change-Id: Icb3885d3f43874c10769664cd76032582df52cf6