Merge "Use ColorMatrixColorFilter in batterymeterview" into rvc-qpr-dev