Merge "Set RetailDemoModeService#mDeviceInDemoMode to false"