Merge "Fix issue with system gesture areas being too large" into sc-dev am:...

Merge "Fix issue with system gesture areas being too large" into sc-dev am: 7a2b7fc4 am: 2442bb9b am: ae4be880

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14796337

Change-Id: I1e86b6814b898cff86f60781039146cd25d328c8