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

Change-Id: Iff7836115e7ced22d91bf848fd9fa4651a7cdab7