Merge changes Id5f5bdfc,I67b9f30b am: 984c39992c

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

Change-Id: I6f5177c8a60b06cf52a8a1fa0b6d17769e3b3710