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: 27a075aa
Change-Id: Iffdfe18ddc126d71830bc3a64c5a0d03eaa457e7