Merge "Explicitly start device lock system service." into udc-qpr-dev