Merge changes I2ae32895,I9e3c6f01,Ifc0e00f3,Ia9cb163f am: 2ce6ffd58b

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

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