[automerger skipped] Merge "Update max diff of pseudoranges to 48ms" into pie-cts-dev am: ed7d12a62b am: c286058ae2 -s ours
am skip reason: Change-Id Ife969a3173373e7cc71c37b4184faabce2dc645f with SHA-1 d76faee65e is in history

Change-Id: Ia025b35620bf022af6c6fca4ced69f4e989d43e6