Consolidate wake-screen settings

Test: manual
Bug: 111414690
Change-Id: I8e0eee3ea00b1eb9cbe534cc60bfccec43cf8e31
3 files changed