[automerger skipped] Merge "Expose netId by adding getter API" am: dd9c1f56fc am: 63a9f58437 -s ours am: 744cf62d3f -s ours am: 7ddcca3e1f -s ours

am skip reason: Change-Id Ieb1483c146aa2f7d8f251157e6e81d71c44ae899 with SHA-1 dc651f03da is in history

Change-Id: I201751a0cf87a56ef1ff75d6548f0a902798001b
tree: 7491a9e350d83226e61e82455835dfffdfa7cbd2
  1. Tethering/