Merge "Fix tap is wrong in landscape with cutout disabled" into rvc-dev am:...
Merge "Fix tap is wrong in landscape with cutout disabled" into rvc-dev am: e983bd43 am: 15cf6453 am: 644fc311 am: 88ec578c am: 30d0342b
Change-Id: I93439c7ae1d1b11d133c1b5c39a5f62a3eb86ce8