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