Merge "Straighten out NetworkAgentConfig's equals()" am: 110ec66819 am: 3160e283e3

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

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