Merge "Fix OffloadControllerTest on R" am: 767b2180e9

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

Change-Id: I5c78e3e4cb44fa88ad698bdf4cbc88f47b954e3c