Merge "IMMS should preserve selected IME upon boot" am: 154519eb52
am: f65fd37910

Change-Id: Id8a482c02f7eedede0f43cf741e8a5a924e48644