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

* commit '28608bbb2fb6daf3d261cb10eaeb1849781cf77d':
  Improve heuristics for detecting wireless chargers.