am e6dbddf5: Merge "Fix bug #11709153 CTS: android.view.cts.ViewTest#testPadding tests are failing in KLP-MR1" into klp-dev

* commit 'e6dbddf594cc78057111494a989e0155c2445aeb':
  Fix bug #11709153 CTS: android.view.cts.ViewTest#testPadding tests are failing in KLP-MR1