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

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

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