Merge "[Large screen] SplitListener may not provide correct information" into sc-v2-dev am: 672185ffe7 am: 54fec9c294

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

Change-Id: I9cfaa9a65542406797d3428568932a1c4370912d