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

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

Change-Id: I60c2383c2e00578301c24c425b2df8a297fc3dc5