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