Merge "Improve dumpsys logs for NetworkProvider and NetworkOffer" am: 58f5b1a89e am: a0091fda4f

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

Change-Id: I9a5d93b12b2700f16c94e5f7b6fbe77dbb2eb2fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>