Merge to M39: Don't adjust the bounds after a restore with the restore's paired saveLayer's paint.

Originally landed as:
https://skia.googlesource.com/skia/+/8e393bf70ea2aab9ca31f52c15b518436c7b6055

Original review URL:
https://codereview.chromium.org/623563002

BUG=418417

Tested: on M39 branch, out/Debug/dm && out/Release/dm && echo ok

Review URL: https://codereview.chromium.org/617403002
2 files changed