Merge "[SP32.3] No-op refactoring of OffloadControllerTest" am: 4ec15d5d71

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

Change-Id: I97fba52572d7244106b3ee3770431939804dbc5a