[automerger skipped] Merge "Avoid users add one-handed mode by edit shortcut...

[automerger skipped] Merge "Avoid users add one-handed mode by edit shortcut dialog in unsupported devices" into tm-qpr-dev am: edb3794e am: 8742930f -s ours

am skip reason: Merged-In Id0696bff522cb7e19c5a16a47bbb76a794472c52 with SHA-1 1a9081a9 is already in history

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



Change-Id: I6e3d0caa01cad9fc95af8a8a4447d88a17b3aa34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>