Merge "Fix OffloadControllerTest on R" am: 767b2180e9 am: 634ad9792d

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

Change-Id: I2cd282bf6d7a4638cbb65f20f2ccd886ec113713