Fix how displays are used in test cases am: 017cb98ee9 am: 1186b99120 am: ed6ebed9f3

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2305821

Change-Id: I687ff1d38a350929060476001efd289ef5ca507a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>