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

Change-Id: I64025394589ab4875ecab18e7024e680fdcbfedb