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

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

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

Change-Id: Iab7039996623fc0ff5ae22198edb8d9bcc8adb8b