Merge changes Id2ffb056,I2a4e298b am: 420fa2baef am: 9477c7b5ca am: b5697afa2d am: ee4372a572 am: febd76b8bd

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

Change-Id: Id753fdb1d7194227df5b6bb5a25d6d2a9e8b97a2