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

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



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