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

Change-Id: Id2fa72f7347ab8513762ad35c4040991799e9ae5