Merge "fix mistaken check of mScreenBrightnessDarkConfig" am: e6fe836938
am: 0046acc2db

Change-Id: Iff046d5f35c34a425e4765a69700d09d6834b16f