Merge "Ignore the charging ripple flag." into sc-v2-dev am: 8833af1652 am: 3a7b2c168a

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

Change-Id: Iee324e86c07e2e2dd3a7c73c36b9f0809d690568