frameworks/base: Fix key remapping after toggling navigationbar.

Change-Id: I8069e3106601caf3990cbcdc5056ffc64ddf7bcd
Merge "frameworks/base: Fix key remapping after toggling navigationbar." into lollipop