Merge "Add back the shortcut dialog content for accessibility gesture" into...

Merge "Add back the shortcut dialog content for accessibility gesture" into sc-v2-dev am: b1bdec31 am: 4978a2ed

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085455

Change-Id: Ie57e31e13502471c2a05a180c09b5d443c6a3fe1