tree 7e19a488754b08e26233cd893cada34ddfd6ef6b
parent 60fcc50d8ec96c838b6a3f117b492da06b8acfdc
parent dea89ca31ccde7b0761c989d146695d3b1f03844
author Lucas Dupin <dupin@google.com> 1595294685 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595294685 +0000

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