Merge changes Ib2d54e53,Ieb606d2b am: c5e61cc540 am: af97e30d9f am: bcc25755bf

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

Change-Id: I6a74e1090f563ad756f7d8afb7a852dc9e7f78eb