Merge "Include the failing stats in stats failure assertions." am: 27979bd116

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

Change-Id: I05c36d9718a07041224dded9e32c755321760acd