Merge "Remove "Device Controls" from Settings" into sc-dev am: ee2086872e am: aa0062c92f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14215389 Change-Id: I94db4f82632e1b54b5ad157bd73cb44dcafc002c
This commit is contained in: