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

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

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