Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2

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

Change-Id: Iabf2fd3919523abf771908f4c5a4ad6c9b2710e2