Merge "Update IME/keyboard switcher navbar icon to GM" into pi-dev am: 7ae1fbb496
am: 10c82a1cd5

Change-Id: Ia8eac9dd104286145ee5becde766ce0053e27d01