Merge "Test for not logging meaningless caps changes" am: b1f3dd9dd1 am: b767eb1125

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

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