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

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

Change-Id: I3b911b4a573e3464a11a6ff2729703121cc9a4c3