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