am 9def46c9: am 09652ac1: Merge "Allow phone to enter suspend with positive proximity." into klp-dev

* commit '9def46c9763c4e32690c15085e04985d29a7d485':
  Allow phone to enter suspend with positive proximity.