Merge "[inputflinger] fix -Wreorder-init-list" am: c932e4472f
am: eb013d0f82

Change-Id: I4d5e380b6327d898e994189c1c6cfdb73f226fc7