Merge "Fix KeyEventInterceptTest fail" into rvc-dev am: c41bb27e88

Change-Id: Iddd9bf9cc002ee96e67491169641bf01ce5429f9