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: I576e9a8b51680b7c4263debf43b6344e362d9153