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

Change-Id: I0b4ff44b05079ad33c61b42225e08f88853d4229