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

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