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: 35229761 am: d5a23e5b am: 6db7f5af

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



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