Merge "Move fromStableParcelable to KeepaliveController" am: 1d1b1fe999

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

Change-Id: I64a68e527701920a5956fbb51001c42b938159cb