Merge "Update settingslib input method OWNER list" am: c0be5ac445 am: 19ef3701aa

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

Change-Id: I4016f04a13f8532a273130b10a391c8200389739