am e25f7663: merge in KQS81M

* commit 'e25f7663':
  Fixed failing CTS ConfigTest on KLP
  CTS: android.provider.cts.TelephonyProviderTest#testOpeningAnyFile is failing on KLP
  Remove unenforced READ_EXTERNAL_STORAGE tests.
  Adding pollcheck to check if the dialog is showing
  Fix android.os CTS tests.
  Fix and expand media scanner tests.
  VideoEncoderDecoderTest fix maximum calculation
  Fix MediaDrm cts tests
  Deflake WebViewTest#testFlingScroll
  Removed RingtoneManager obsolete DRM methods from CTS test.   Fixes bug b/10668217
  [WebView] deflake WebViewTest#testPageScroll
  Disable scaling on decoding bitmap reuse format test
  Try to zero the EGL initialization count
  fix CTS test. RGBX_8888 is a 32 bits format
  Fix failing CTS test Bug #10309299
  fix more default Paint flags CTS tests
  fix default-Paint-flags-related CTS breaks