Merge "Fix bug where screenshot preview margins were too large" into...

Merge "Fix bug where screenshot preview margins were too large" into tm-qpr-dev am: 55d9c878 am: af537251

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20670528



Change-Id: I5a9ec0edf7ed8620c3ac823740a083e7cdab9c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>