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

Change-Id: I661c37ace30f0fb034986908a7289b44581e3644