Merge "Add aconfig flag for keyboard shortcut dumpsys." into main