Merge "Update GnssAssistance AIDL to match framework changes." into main