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

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

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