Merge "Fix tests for devices that don't have drm@1.2 services" am: ac16446bd2 am: bebc590eba am: d0145126db

Change-Id: Ic751c4f1a74addfeae51e42275e077a922c9fcc5