Merge changes Id5f5bdfc,I67b9f30b am: 984c39992c am: 3bb5db3955

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

Change-Id: Ie9d703efe526ac1b6a643979783f03870565d754