Merge "Revert "Fix input infos are inconsistent between WMS and InputFlinger...
Merge "Revert "Fix input infos are inconsistent between WMS and InputFlinger (1/2)"" into rvc-dev am: 41806b24 am: 74f0a823
Change-Id: I5436bb45ed5bdc89890323ff54c77a3c7c6a069f