Merge \"Removing Key-Value pair backup logic as Launcher now uses full-data backup\" into ub-launcher3-calgary
am: 804420b2fd

Change-Id: Ied70fb6678c8090fada0e1cc7d84d6c7af51a09f