[automerge] Bugfix 2p: 7d5029210d
Merged-In: <AOSP-19030214>
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19030214

Bug: 236789888
Change-Id: Ie7f571930f1f26ac3fde8c83420acc0fd28530b8