[automerger skipped] Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev am: 16ff25f5a7 am: f31e6d1c22 -s ours
am skip reason: Merged-In I7417ccd3899ffba05411ebb4e56c255f6ef09f54 with SHA-1 7d6516684e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15331207
Change-Id: I4c042406967156993da92d08c846baf5355c3653
This commit is contained in: