Change screensaver ctrlr to base pref ctrlr. am: 542644e8 am: 955a2f2a

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



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