Merge "Add master toggle to enable/disable screen savers" into tm-dev am: b048c37062

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

Change-Id: I7ff138626b93f227ca42546a2b3500d00b7d0f0b