Merge "Merge "Fix input infos are inconsistent between WMS and InputFlinger...
Merge "Merge "Fix input infos are inconsistent between WMS and InputFlinger (1/2)" into rvc-dev am: 6a35c77c am: 02690f94 am: 13781f64 am: de79dc21" into rvc-qpr-dev-plus-aosp