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: 8d5c1ef5 am: 6dcff03c
Change-Id: Id0e8ca942955ef963cd2498cab92eeb5f47217af