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

Change-Id: I57eac3b1b9be66efdbd3195488ec027e3b77ed0c