Merge "Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 6e269ec6fe am: 359f2215eb" into oc-mr1-dev-plus-aosp