Merge "Update the CarLocationService to work when the system user is headless." into pi-dev
am: 7603beb9f6

Change-Id: I1e8acf96f6db2b75bcd8d60bb8c024cb4b95ed9c