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

Change-Id: If887f5db78e18c43a283728db38b1447f313ed8d