Merge "media.c2 aidl: fix GraphicsTracker bugs" into main