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

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

Change-Id: I81133408727cc7e4ac85017c16ac15450803f42c