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
Change-Id: I80c94c1ea7e832ace8b87de0c2a1b35009fa0653