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

Change-Id: Icd809e1b3a63116a184a0da8ceb00752fd7abd27