Merge changes from topics "recoveryTimeUnit", "vpnRecovery" am: 537451ea67 am: b57e43196f

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

Change-Id: I4bb27ec219187308324e5d31eed9c3543af2f72a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>