Merge changes from topic "sdk_int_cp" am: 800eff01d0

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

Change-Id: I683d14bcaac2c85e2551b729d2d97d036cdc824f