Merge "Fix HoverTest for screens with a camera notch" into oreo-mr1-cts-dev
am: 284a57a9fe

Change-Id: Ic8c64443ce6c1dc26b2be804d5456f980cc0fe49