Merge "Update screenshot and long screenshot UI to match mocks" into udc-dev am: 2f80e5e1 am: 6397cb99

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



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