Merge "Force-reconnect wifi (and cell) after disabling airplane mode" am: 8a9562f2c4 am: 2c68feb46a

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

Change-Id: I2e211a45f160645954fbd080cd56d7f1e712ace3