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

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

Change-Id: I563bbba3db26a9e5691159696c08141599b4dcae