Revert "Merge pull request #14948 from timdream/keyboard-app-icon"

This reverts commit 67a82f88da231969efa4d22df9fb946abf2cf4df, reversing
changes made to c7a33340ca6d1225e8055951c714f5414498bb6c.