Step on old commits to merge new hasPermanentMenuKey

For the sake of clean code we should revisit this later
https://github.com/VanirAOSP/frameworks_base/commit/f3123e33851892861c9c9e454c37aa87e25cc357

Change-Id: I4cb336ce7828ec2eaa845beab0e1a8d8f9909b26