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

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



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