Merge changes I99ce72bd,I5a11a802 am: 527ffb6f0c

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

Change-Id: Icb435dbe7be5eb125b88336263fd3519139501db