Merge "Merge "Only use the IME target from IMMS to update the IME control target" into rvc-dev am: b7dda7d9d5 am: 0aa6c379d2" into rvc-d1-dev-plus-aosp am: d469014c58 am: b7b569801c

Change-Id: I882053dfe4fe4521a28f3aa3cb9fccf9243f6966