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

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

Change-Id: Iee2caabd9adbdfdffea197582c8005d444ca32c8