Merge "MediaMetrics: Convert to AIDL" into sc-dev