Merge "Update input method OWNER list" am: ce650fd908 am: c73a915387

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

Change-Id: I6982be794a22c616c8f0703cc2ebc62ca5de26e6