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