Merge "Merge "Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable." into qt-dev am: b7abebde5b am: c0ecccca16" into qt-r1-dev-plus-aosp
am: 6533a69689

Change-Id: Ibea62abfce411333b3eb9b7cc0bf0876c065e67e