Merge "Adds additional UiEvent logs for LongScreenshotActivity" into sc-qpr1-dev am: 0dca9ae534

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

Change-Id: I4a4f8a000fbd532b2fdd04952797171504163332