Merge "Revert "Add setSatellitePlmn() related HAL apis"" into main