Merge "Don't turn on prox when wirelessly charging." into rvc-d1-dev am: 7e387342d6 am: c8b62b40b6

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

Change-Id: I69ed661ea34e121e9b6d47a35201b5d77d82fe27