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

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

Change-Id: I7997d03ce78a1f391ee80651278d4e72d2fe0d8a