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

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

Change-Id: Id4e83a721a8114047d2e8a6cd1f465217422c34e