Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am:...

Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am: d81ae0a6 am: 2a557b75

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



Change-Id: Iefe3c423fae6c6eb720b1b816af196736089067f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>