[automerger skipped] Merge "DO NOT MERGE - Defer migration to CarUserManagerHelper, until CarSysUI" into pi-dev am: 330713b381
am: 66e2fbf7ca  -s ours

Change-Id: Iec8c9790ef4bea061648e4bf65ebec2114cfd899