Merge "Remove synchronization from getCurrentInputMethodSubtype()" into nyc-mr1-dev am: 9603bc398a
am: 5c90c8d620

Change-Id: I1916162d7254ec94c7d372e8db7adf26c433af68