[automerger skipped] Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71 am: b8c3c59504 am: ab2a5cd02f -s ours am: 655aaef84b -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: I174fa67ee0f27cd6024fc40abeb3cecd248af5f0