Revert "Revert "Fix no keyboard on N builds""

Looks like the underling issue is not fixed yet.

This reverts commit 7bb0465687fdf58bc2c377b8dfa454d8c75c983a.

Bug: 26190615
Bug: 28151196
Change-Id: Icee6d90fc4336e832f082ce2974edfa558170030
1 file changed