Merge "Revert "Fix input infos are inconsistent between WMS and InputFlinger...
Merge "Revert "Fix input infos are inconsistent between WMS and InputFlinger (2/2)"" into rvc-dev am: 8f0b5bda am: de2139ee
Change-Id: I9c9778d7f63fa7c68a83025378793c957895c1c6