[automerger skipped] Improve VTS GNSS 1.1 reliability.
am: 2d86da7b28  -s ours

Change-Id: I39065adff58041aaaa392310e91b92fabbe2be9d