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

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

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