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

Change-Id: I764a15a2d8d22f04524191bf500362ac4566e33a