Merge "Revert "Fix input infos are inconsistent between WMS and InputFlinger (1/2)"" into rvc-dev am: 41806b2498

Change-Id: I5d00d0712cf8cff362de37ca127eafd4a4c42f3d