Merge "Fix shortcut toggles content has been covered by Switch Access...

Merge "Fix shortcut toggles content has been covered by Switch Access accessibility focus." into tm-dev am: 1a3bdbff

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

Change-Id: I71dc970a2d21b11bea917a59b6b7951f060044c2