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

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

Change-Id: Ie695d84624595ecbf479d6d724be5f191ead4619