Merge "Settings: make SHOW_IME_WITH_HARD_KEYBOARD TestApi" into rvc-dev am: 7883b53e28 am: 42c810bd0b

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

Change-Id: Id5c822de5a74a31d153a48c1cbeb390f2676a182