Merge "Use <chrono> for injectInputEvent timeout" into rvc-dev am: 9467e10d79

Change-Id: Ia74202941cec73f016ac4692ac2c54ccfe070a3e