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

Change-Id: Id4441fd3eb661b25618f4e94cd99a01a432e2eeb