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