Merge "Add an incorrect context violation on GestureDetector" into rvc-dev am: f843a852 am: d74aad1e am: dbde2b20

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

Change-Id: If7d99e3be0e01e0c21888732310c38621bcac274