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

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

Change-Id: I5c5d45a2ecb959edb2b0ff69b3fe2fd68f3dc81f