Merge "Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde1149 am: 563c5451 am: 4293455f"