[automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: d1c8af2783 -s ours

am skip reason: Merged-In I0b02d01cd8749d81c9d020dee7fdb4f80e18ae98 with SHA-1 36aa3f237c is already in history

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

Change-Id: I4933ce379eafa34222c8e22c6da535fb508e3428
tree: 42703ad7fd638f5bfad36bf11fc5afc891a2b2d3
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING