Merge "Add OsCompat" am: 1e2ad80467

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

Change-Id: Ic9413d32bedfd6890b7a1bffa286c228af72b32c