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

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

Change-Id: I38037202f8b6db47d1383009d046bc3880726358