[automerger] Merge "Fixing failing tests in CarUserManagerHelperTest." into pi-dev am: 08df676ffb am: 6e8850b79f

Change-Id: If49ebd0800c5c1f890d42ed1b45f09decba1975c