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

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

Change-Id: I6d08b821f63f2cf273cea18f790284343b94395b