[generic-ranging] Sync with latest changes in gmscore

Bug: 331206299
Test: Compiles
Change-Id: Ifde70e22feff54e4619c48decf029a1d74dcedc6
4 files changed