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

Change-Id: I12c07eb4196e538aa1f792445c9f527463b69fdb