Merge changes Id5f5bdfc,I67b9f30b am: 984c39992c am: 3bb5db3955 am: 355585324f

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

Change-Id: Ifafe51d145f5a1b89d067f399408b5bdac0e147f