am a2bc2d25: Merge "Support BTN_TOOL_*TAP as synonyms for BTN_TOOL_FINGER. Bug: 5205301"

* commit 'a2bc2d2569e52dccb8df8fa73b9557e465113aab':
  Support BTN_TOOL_*TAP as synonyms for BTN_TOOL_FINGER. Bug: 5205301