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

Change-Id: Ic15474fe0b7da8062114367ec4f692e30e73d549