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

Change-Id: I884ce059f9fb327cded98020c2be794f21c8b01f