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

Change-Id: I2048b523f050409a937dfd035b8dc58948c6ae64