Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey"