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

Change-Id: Ib204b8154e5359e180f70a99a8657cbf3411cd04