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

Change-Id: I95ae60312c5e0437ba00ccd73e45770149733043