[automerger skipped] Merge "Move connectivity AIDLs to android.net" am: 11d3809b9d am: 15dc1c518a am: 78348df057 -s ours

am skip reason: skip tag Change-Id I77c4ea0dd3d9b64bae59b0e1c3fe8e1275de20de with SHA-1 fbb28ed9e5 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1605113

Change-Id: I0d4d44143f78e60e35590ff4963c3867e0e95a3b