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

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

Change-Id: I618fa0be7b4534616b58ea1f79f10c281318018f