Merge "Merge "Avoid acquiring a lock on the InputReader thread" into oc-dev am: 4132f86041" into oc-dev-plus-aosp
am: 2931c05a00

Change-Id: I2b621496be3d688ba547188ef4bd68f35fe5d1a8