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

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

Change-Id: I2f68e2698865d3462c0b16a1d84bdd3b75fd63da