Merge "Fixing tests in CarUserManagerHelperTest." into pi-dev