Merge "Revert "[DLC vNext] Add getDeviceIdentifier to IDeviceLockControllerService"" into udc-dev