Merge "Add LinkProps and NetworkCaps methods to SystemApi"