Merge "Prevent gps stuck on if multiple starts are called" into oc-dr1-dev am: 80b07fc4de
am: 4a10f893d9

Change-Id: I33a53419e2f69f0da85a8c95b541cf1652383a2a