Merge "Fix overlapped problem in SuW two panes mode" into sc-v2-dev am: cd8a01d2fd am: c6bc7a7c4b

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

Change-Id: I8c1f0b3a19239f85a4f67b53dd703ed7a9d3a625