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

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

Change-Id: I8a014023f8ce6428ac20352336baee9d938a7121