Merge changes I2e05b016,I8ff36f37,I302bbe8d am: 0b5879e17d

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

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