Merge "Fix GnssManagerServiceTest"