Merge "Fix CarUserManagerHelperTest." into pi-dev
am: 89335b1c22

Change-Id: I2cb668c1a406a994348ff4fc3cbc57e61ba55dad