Revert "Fix no keyboard on N builds"

This reverts the previous commit [1] since the keyboard shows up without
such a workaround.  Presumably someone might have fixed something in
somewhere.

 [1]: Ifd588bf7db76f9ea5d6a90854f8e92f86f4c2910
      250faf92.

Bug: 25942488
Bug: 26190615
Change-Id: Ie0e0ead960473a3504fc88a4f7d4d18108ef0e18