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

Change-Id: Icea3e8af29bddba6c7f77148839a452634090188