Merge changes I3b7913c5,I9c1d6294 am: 4bd0f6bb2a am: d66af86b10 am: b3e167529e

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

Change-Id: Ie20405554d8ecb0f22683949d7892f346bb5a13f