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

Change-Id: I09d703a37e4138bc150eb00970e0a279ec6e6e00