[automerger skipped] Merge "VTS 1.1 TestGnssMeasurementCallback test must allow 1.1 or 1.0 versions" into android10-tests-dev am: 56f1c0c181 -s ours am: ae69e92bd9 -s ours

am skip reason: skipped by user yuhany

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1132858

Change-Id: Icc0ff9cef75c64bea4e1413cee5ea503abb27e9d