Merge "Remove "Device Controls" from Settings" into sc-dev am: ee2086872e

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

Change-Id: I87db94c693686b479a62f9375f54feb54bf4a031