Merge "Include compared values in assertion messages." into mainline-prod am: b65d3c1893

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/13356033

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifdcd541379eaae05108291298db9c29c427633db