Merge "Use updated GpsScanStateChanged package" into tm-mainline-prod