Merge "Update screenshot and long screenshot UI to match mocks" into udc-dev...

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

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



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