Merge "SurfaceFlinger: Add touch events to Scheduler am: 8532d01111 am: 17d37dcaf2" into qt-r1-dev-plus-aosp
am: c45593456a

Change-Id: Ia5c255fb7cb012bfc4a4188fb3aa08fb64dc203a