Merge changes Ie102f962,Iaaaab5e4 am: 1d696fe787

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

Change-Id: Ib21ed046d7f80a45011e9052a2fb015f42b259fe
Signed-off-by: Automerger Merge Worker <[email protected]>