Merge "Improving hierarchy dump for test failure" into sc-dev am: e9d8df54ab am: 8c15da0654

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15097672

Change-Id: I1135b78015f8d00b2d5566874b3b7d4ed50e6838