Merge "Updating logging so that edge swipe logs do not get evicted by normal...

Merge "Updating logging so that edge swipe logs do not get evicted by normal taps" into sc-dev am: c0b53c93 am: 915745d1 am: 659349d7

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

Change-Id: I10e0fdd4a4f8be336e53e878350ff38418fd421d