am 2f1ef77c: Merge "WirelessChargerDetector: Work around bad sensor timestamps." into klp-dev

* commit '2f1ef77c07da2ed7168f75551dd632026b20f8cc':
  WirelessChargerDetector: Work around bad sensor timestamps.