Merge "MultiFingerMultiTap: reset the expiration clock when fingers go up." into rvc-dev am: 2a5f86f78c

Change-Id: I16b478811c715d814ca0386d73c54beec8daee66