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

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

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