Merge "Revert "Fix input infos are inconsistent between WMS and InputFlinger (1/2)"" into rvc-dev am: 41806b2498 am: 27a075aa63 am: fc8b3565ac

Change-Id: Iae932e9933facd6886887a8cfa3bc016b5b9d0fe