Merge "Revert "Add Media Quality Service AIDL default implementation"" into main