Merge "Move fromStableParcelable to KeepaliveController" am: 1d1b1fe999 am: ead12ae16a

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

Change-Id: I40b55a21413c18b7427db576739439c6e6dfb4aa