Merge "Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable." into qt-dev am: b7abebde5b
am: cf48a8e828

Change-Id: I52be8889cc8bf9a35017785541717014fc09eefa