[automerger skipped] Merge "Honor per-user setting for assist gesture and...

[automerger skipped] Merge "Honor per-user setting for assist gesture and long-press home" into sc-dev am: 49a91f2b am: 01677e72 -s ours

am skip reason: Merged-In I5e3587ddb0fa4bd1ef68488485d73641e0582d2f with SHA-1 205a1714 is already in history

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

Change-Id: I0d9281f88f6c41e46de0cf65b6dd6ea787c0438b