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

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

Change-Id: I61eaa7de485e4ae653e35e9929bfa1537b108fcf