Merge Screen Attention and Screen timeout Settings.

Bug: 155051311
Test: atest
Change-Id: I6f6ee52618eab629a41b28982be32ead5f9ba08d
17 files changed