[FUI26.1] Generalize assertSameElements am: 4fe8286217 am: 75babd3e64 am: fa7fbfd136

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1618691

Change-Id: I9fc06da3baa7a0f450142346e375fe7a64938803