[automerger skipped] Merge "Apply Dark theme changes when screen off only"...

[automerger skipped] Merge "Apply Dark theme changes when screen off only" into qt-qpr1-dev-plus-aosp am: 55ac974b -s ours
am skip reason: Change-Id Ib769df4302d1c09166e2dc456b8ced35daa4d0b7 with SHA-1 5f116e1d is in history

Change-Id: I86d4985e574fce268f1553b7d73b3f28f93c2846