Merge "inputflinger: add missing <functional> include" into udc-qpr-dev-plus-aosp