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

Change-Id: Icfe39aa7af28ac15c524b960d49edf34150f0e3f