Merge "To re-adjust the layout to pass the test in switch access and talkback" into sc-v2-dev am: 6dbbb8557f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16440119

Change-Id: I26b5169277d74860bdc5ebe980d9256871dad5d5