Merge "Merge "Revert "Fix input infos are inconsistent between WMS and...
Merge "Merge "Revert "Fix input infos are inconsistent between WMS and InputFlinger (1/2)"" into rvc-dev am: 41806b24 am: 27a075aa" into rvc-d1-dev-plus-aosp am: ea335377
Change-Id: If15761fdb9409507de428710537da548d2f024d6