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

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

Change-Id: I185f9aa105add578fa9bdc30d920deefdca6a7b5