Merge "Fix NPE in edge back gesture handler" into sc-v2-dev am: ef3d227783 am: 7b6db36d01

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

Change-Id: If29810233126f050afc9632310af7795042a2427