Merge "Fix GnssHalTest#TestAGnssExtension fail"