Merge "[inputflinger] fix -Wreorder-init-list"