Merge "Avoid "android.media.mediacodec.log-session-id" print redundancy" into main