Merge changes from topic "low-power-standby-impl" am: 3b20dfbcb7 am: c1ce10a64e

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

Change-Id: Ibdbf2ad496bc07d7c36229e3680da3a96632f3f5