Merge "Access DeviceConfig as system_server" into tm-dev