Merge "Fix magnification cutout while performing back gesture" into sc-v2-dev am: 7834387feb am: 1eac0d7bfb

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

Change-Id: Ie378362fe87dc05109f608dcdb03302fe00cc809