Merge changes Ib2d54e53,Ieb606d2b am: c5e61cc540 am: af97e30d9f

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

Change-Id: I280e38cb067348c8f46fc64ee70b706d3ee5c9a4