Merge "Fix SetupSkipDialogTest" into tm-dev am: 9512dfd7a2
am: 209c747910
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312727 Change-Id: Id9af1c4f97a4f33f3eab56b07201c1abb2e43936
This commit is contained in: