Merge changes I8d15b626,I993e8da9 am: d15e52eca9 am: 3cc611d69a am: 45dd5391ed am: 7a80ae85d6

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

Change-Id: I5e3dffc6d97fc8fa3fa5a44a9646aa657ce12760