Merge "Support SUPL over satellite" into 24D1-dev