Merge "Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b am: 563c545187 am: 4293455fd1"