Merge "Make additional IME Subtype ID persistent." into nyc-dev
am: 063fe65

* commit '063fe652be5ac01f1d4ffe621dc2a5f7e2170198':
  Make additional IME Subtype ID persistent.

Change-Id: I468fdb96d5a4963ae905059e38178e775da7755d