Merge "Fix double-checked locking in InputMethodSubtype" into oc-dev
am: da93d0ea9b

Change-Id: I9b2399fab63825f693be1b8778f4a07fccce6c8f