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

Change-Id: I55465d3d95a317c7fdcff99298e89408190e67e3