am 6cde6c75: am 41685ce9: am 898d6d96: am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev

* commit '6cde6c75b3469b7f76343ef7fc646f65c8393a17':
  Add a config override for ViewConfiguration#hasPermanentMenuKey