am 7b085571: Merge "DO NOT MERGE Adjust update interval when expiring location requests." into jb-mr1.1-dev

* commit '7b0855715bc6cb14e3ca67d815915d2172f0bc12':
  DO NOT MERGE Adjust update interval when expiring location requests.