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

Change-Id: I8c672c3a2457f775c07d97863baf05ad0fdc45c6