Merge "Merge "[CTS] Fix test CtsInputMethodTestCases Fail" into android12-tests-dev am: 7345c995e7" into android12L-tests-dev