Merge "Fix lint warnings under services/tests/servicestests/src/com/android/server/inputmethod/" into sc-dev