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: 7041af0a
Change-Id: I55333dcdb03856fda0944516ff01f5c44db2c526