Merge changes Id2ffb056,I2a4e298b am: 420fa2baef am: 9477c7b5ca

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

Change-Id: I37ae39abf32d7f907896ece55cf50194b5a146cd