Merge "Use ColorMatrixColorFilter in batterymeterview" into rvc-qpr-dev am: a759432bac

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12940164

Change-Id: I85a7473dc387759fab15956aba8a24233fe03861