[automerger skipped] Merge changes from topics "inputdispatcher-split-aosp", "inputreader-split-aosp" am: 0c1abd12f9 am: c46722cd3f am: f39f7c8fe6
am: 5598f51899 -s ours
am skip reason: change_id I4966919cd5b42353dd8c1e7cc7663f6c83765542 with SHA1 2770d24730 is in history

Change-Id: Ie3446f734e62fc47deef79a442ed2d54853980cf