am 42544cf8: Merge "Track wireless charger detector timeout explicitly." into klp-dev

* commit '42544cf843a8e6a3d6ecf57aafdc5a3591a16d17':
  Track wireless charger detector timeout explicitly.