Merge "Remove dependency on stable.core.platform.api.stubs" am: f15f2769b4

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

Change-Id: I94b8ca7d55df35e5f118b69a07b5152b2d0b207b