Merge changes Ib2d54e53,Ieb606d2b am: c5e61cc540 am: af97e30d9f am: 59a234eb77

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

Change-Id: I9ca43c00eb13be6f6bbc69f34a70af558848f4c0