Merge "Fix DrmServer test for devices that don't require drmserver" into mnc-dev