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

* commit '6395c6a4909749d54679be16411783ccaeba4372':
  Add a config override for ViewConfiguration#hasPermanentMenuKey