Merge "To re-adjust the layout to pass the test in switch access and talkback"...

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

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

Change-Id: Ib5e75f0e22abc0e2db3b98fa2f5db096d7017662