[automerger skipped] Merge "Use a different context when constructing an...

[automerger skipped] Merge "Use a different context when constructing an EdgeBackGestureHandler." into sc-dev am: 16ff25f5 am: f7f77d0e -s ours am: 10a8c2df -s ours

am skip reason: Merged-In I7417ccd3899ffba05411ebb4e56c255f6ef09f54 with SHA-1 1cad82c3 is already in history

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

Change-Id: I1f551ec49447619aa0a7bc98f43f67bf90e01272