Merge "Account for per-edge cutout for system gestures" into sc-qpr1-dev am:...

Merge "Account for per-edge cutout for system gestures" into sc-qpr1-dev am: 9c7b6496 am: 568601df am: f6483e1d

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

Change-Id: Iec6493a0d493b4d9c66b5eea8cf62c4231398c59