Merge "Clean up AIDL warnings in GNSS" into sc-dev