[automerger skipped] Apply Dark theme changes when screen off only am: 216c08e460 -s ours
am skip reason: Change-Id Ib769df4302d1c09166e2dc456b8ced35daa4d0b7 with SHA-1 30b412cab7 is in history

Change-Id: I9c425f4cd0321eb35b57ea8960308e7e57551f2d