Merge changes from topic "a11y_gesture_s-sc-v2-dev" into sc-v2-dev am: ede42318

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

Change-Id: I8d6c0a1842b367db8622f7144fbde02bb2a7fa3c