Merge "lcd:fix LCD screen can't be lightened occasionally" into android-msm-sawshark-3.18-gold