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

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

Change-Id: Ib0202cc1198d49a99c7f927ace1207e91795d901