[automerger skipped] Merge "Fix metrics didn't log...

[automerger skipped] Merge "Fix metrics didn't log ONE_HANDED_TRIGGER_GESTURE_OUT logs when NavigationBar type is Gesture Navi" into sc-dev am: fbe969c9 -s ours

am skip reason: skip tag Change-Id Ifd358d2aeda1a518f184216674a304511e251100 with SHA-1 688e89c6 is already in history

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

Change-Id: I9c18c5c847ea1137cbc95122c5f4025ca743abad