Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo