Merge pull request #35333 from mdorman/connman-fix
connman: fix build with upstream patch
authored by Franz Pletz and committed by GitHub 8 years ago d16274da 278bc224