Merge "Factorize describeDifferences" am: 74aaf2c5cf am: 2c24a22a09

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

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