Merge "Use IBinder#shellCommand() for 'adb shell ime'"