Merge changes from topic "low-power-standby-connectivity" am: c22652401d

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

Change-Id: If1b90e9c8d99172faadcb0f0bf962239c375af7d