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: 74f0a823" into rvc-d1-dev-plus-aosp am: 53310580
Change-Id: I505719123e326dd0531c52b919f35194daea8e0d