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

Change-Id: Iad174757bbb77ce2eef4bd39fd218b64f6e35931