Merge "Move selectability to switch from container" into sc-dev am: 235006fc...

Merge "Move selectability to switch from container" into sc-dev am: 235006fc am: cbc37a27 am: 5046ed6a

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

Change-Id: If942e506b8128f5871ab99d4afe100c450ece5ea