Merge "Merge "Don't turn on prox when wirelessly charging." into rvc-d1-dev...

Merge "Merge "Don't turn on prox when wirelessly charging." into rvc-d1-dev am: 7e387342 am: c8b62b40" into rvc-qpr-dev-plus-aosp am: e195484f

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

Change-Id: I1d8b6f5291149c8198c161d6ae354cb9c378ec0b