[automerger skipped] Renamed NetworkKeepalive back to its original name am:...

[automerger skipped] Renamed NetworkKeepalive back to its original name am: 8661e3bb am: 7f48ee18 am: 4cac45ff -s ours am: bf524544 -s ours

am skip reason: Merged-In I8da370ef41d8e9279e56efb05fc5c803ceea3e70 with SHA-1 8ca4ca96 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2011656

Change-Id: Ie02b1143879fd0352de82641691e3e56955014c7