Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev am: b84b7d586a

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

Change-Id: Idb41f923cdbe1ebc251a1c033d8066404898f768