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

Change-Id: Ic780ee41444f3b335339d5bfe418ce2738785ea7