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

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

Change-Id: I8f9a9e965f6803e5ea36a92d5f65732182b0d41e