Merge "Retain hal_drm_server attribute for neverallow tests" into oc-mr1-dev am: 0ca69733 -s ours am: 4c0de653 -s ours Change-Id: I4f905775ba73c3ebd8a04ecad72b7550b8ec04c9