am 503cda0d: Merge "Fix bug #10205316 CTS (KLP): android.graphics tests are failing" into klp-dev

* commit '503cda0d3928604036d89e2234c23ade6100577b':
  Fix bug #10205316 CTS (KLP): android.graphics tests are failing