Merge "media.c2 aidl: do not throw status, return instead" into main