Revert "Fix onUserInteraction not called with 3-button-nav and e..."

Revert submission 28167631-on-user-interaction

Reason for revert: Likely culprit for b/351986186  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:28167631-on-user-interaction

Change-Id: If79c90990817284adf36171fd515d836c6272483