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

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

Change-Id: I2a8ebb8d92d0972cf43282108e431226ebf60cc6