Merge "Fix screenshot swipe dismiss logs" into tm-qpr-dev am: 616d0b03 am: c10047ad

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



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