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

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

Change-Id: I3de22c6313d83b991dd880c5520a3e1ecfe0999b