Merge "Fix CTS android.media package testEncodeVirtualDisplay seldom fail issue"