Merge "GPS handler have some delay and will remove listener after request...

Merge "GPS handler have some delay and will remove listener after request location update, and it will cause passive provider got additional one fix. The test will met the failure by "passive gps location updated too fast: 1000ms < 1490ms". We add 2 seconds delay between each Test Cycle to fix timing issue."