[automerger skipped] Track and build KeepaliveLifetimePerCarrier. am: 518f3b55f4 am: bc6533ce5e -s ours

am skip reason: Merged-In I113ec68053710a7f41f64a9d6fa4dd83bd924225 with SHA-1 518f3b55f4 is already in history

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

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