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

Change-Id: I3c17a24b926a0005ff1744758e9d4d84e96be584