Merge "Fix CompileTimeConstant ErrorProne findings in SystemUI" into tm-qpr-dev