Merge "Fix hard edge on charging ripple." into sc-qpr1-dev am: 5c3bcace am: ecf934d6 am: 36152ebc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523929

Change-Id: Ic56e15c2aba2f4b5c0ee24311a328c335a035932