am d692ea6d: am b5e4835e: Merge "Improve heuristics for detecting wireless chargers." into jb-mr1.1-dev

* commit 'd692ea6dd297fbd39885525a29bdf6637a3640f2':
  Improve heuristics for detecting wireless chargers.