Merge "Updates keyboard option feature flag name. am: 918ba0c9 am:...

Merge "Updates keyboard option feature flag name. am: 918ba0c9 am: 845d34d2" into tm-d1-dev-plus-aosp am: 28cf9300

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



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