Merge "Remove synchronization from getCurrentInputMethodSubtype()" am: 85539bed77 am: d3e1e473df am: e790c7b2fe
am: 2ef54a4f2b

Change-Id: I627dc54315c3dd5a958a89141dc999b40c921af6