Merge changes I5af6ce96,Ibc1f6813 am: 3938102448 am: 6ae67599f1

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

Change-Id: I83c9a6bd5aac6292829130a918dff4090f4b417c