[automerger skipped] Merge "Expose netId by adding getter API" am: 461f81faac am: d0484fa1dd -s ours
am skip reason: Change-Id Ieb1483c146aa2f7d8f251157e6e81d71c44ae899 with SHA-1 ed55c7ad03 is in history
Change-Id: Idc9f5dc82a1a155b136d07721400eeabd005832d
This commit is contained in: