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

Change-Id: I5155c693cff2ca728a656ad3b5c3e16f40c563e9