Merge "DO NOT MERGE - Defer migration to CarUserManagerHelper, until CarSysUI" into pi-dev
am: 330713b381

Change-Id: I16ae2912f0650a9712bd6e0dd8dd1986537c9050