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

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