Merge changes from topics "inputdispatcher-split-aosp", "inputreader-split-aosp"
am: 0c1abd12f9

Change-Id: Iba37a69eb4dc96bb5bce4395a3831c23ad03bee4