Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92 am: 455ef41ef5

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

Change-Id: I1e5d2eafc493b165cb816ccdd6f1b9bb733a3aa3