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

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

Change-Id: Iefdd8eb15851a4e70ac9eb4fdfb554b60ffdaa74