Merge "Deprecate UserManagerHelper in SettingsLib, use CarUserManagerHelper." into pi-dev
am: ec443f99aa

Change-Id: I3db5f47a6e2e5fc902c935eeda2aec31be5f6421