Merge "Fix screenshot/clipboard swipe padding" into udc-qpr-dev am: be8c277a am: 46cc1471

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



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