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

Change-Id: I109ee9e0efb3cc07742ceb8a845c3c8ea6efc602