Merge changes Idaca34fb,I2b4ca568 am: 2a17c5e624

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

Change-Id: I6f1e96a5cb3084bff90a67d4bfe65e99b8c03eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>