[automerger skipped] Merge "[SP32] Try to get 1.1 OffloadControl hardware if available" am: 69bc4fede1 am: 1153ba0f83 -s ours

am skip reason: Merged-In I6a3ce877cdff2496087b97b191a9bfd5b0792827 with SHA-1 184d458181 is already in history

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

Change-Id: I33ccea392156c32f3f88f76f519cb409ed1573c6