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

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



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