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

Change-Id: I106b12acd2085fd594acec3f0bca4eddea56e444