am 209af33a: Merge "Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor" into klp-dev

* commit '209af33ada8796ed4b27d96bc6d625a08a015813':
  Fix CTS android.media package testEncodeVirtualDisplay fail on some device with low end processor