Merge "Adds diagnostic logging for LongScreenshotActivity" into udc-qpr-dev am: 0091abfa08 am: 44a8689f6a

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

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