[automerger skipped] Merge "Add tests for network controller" am: 17bcd2ea...

[automerger skipped] Merge "Add tests for network controller" am: 17bcd2ea am: 0c1b2a85 -s ours am: 96773a59 -s ours am: 995a12b2 -s ours

am skip reason: Change-Id Ie19377e39137f5ed0914707d898fda67b1d7db63 with SHA-1 6765b77b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1571051

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c632029122a63c010a99771d801eaf0a0cbe6d3