Merge "Factorize describeDifferences" am: 74aaf2c5cf

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

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