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

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

Change-Id: I64327d7a2d064d93ecbba0b62dd551314918d51c