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: I872c16de139d1c096d75da659a33d9269afa765c