Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0

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

Change-Id: Ib1aa32fbf6f2904bd88c418af51db8128ec0bfc2