Merge "Merge "Fix comment on StaticIpConfiguration#getDomains" am: a1e48f3c am: 76de94e7" into qt-dev-plus-aosp