Merge "Retain hal_drm_server attribute for neverallow tests" into oc-mr1-dev