am aec22714: am 5b6069ce: Merge "Wrong parameter in LocationManagerService"

* commit 'aec227148d00e2d0ac438ea538b7e28aea766021':
  Wrong parameter in LocationManagerService