Merge "Fix input infos are inconsistent between WMS and InputFlinger (2/2)" into rvc-dev am: a02bd19485 am: 4aca7a0806 am: d67fc25700 am: 2629404d93

Change-Id: I48425d7fc607954cd99b7dd75fcf817fa369b508