Merge "Factorize describeDifferences" am: 74aaf2c5cf

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

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