Merge "Intercept touches in the emulated DisplayCutout" into pi-dev am: f40c8e074f
am: 2519131dce

Change-Id: Ia6d00310f8e7129d73284a50ddcd7c5085d8466a