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: I8bd0b9412faaac8f14c66f920ca20ed99f1da86a