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

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

Change-Id: I47ba9d63567191d8ca1d1c1eda7159b8afbe6536