[automerger skipped] Merge "Don't overwrite link bandwidth values on...
[automerger skipped] Merge "Don't overwrite link bandwidth values on getNetworkCapabilities" am: 56ceab8c am: c905cdfd -s ours
am skip reason: Change-Id Idb03c4f6bb6b9939024f13266f963be1f9b098b9 with SHA-1 23d3f2e0 is in history
Change-Id: I34798ee343356bb02fdc3c1ca3ea2e9316c17580