Merge changes Id5e5b911,I8301abad,I7262811a,I658e579b,I7d43ef0e am: 4fcb8ad292 am: dc4c974c18

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

Change-Id: I894429d2e56fde9de5d3112c50ca11177283f50b