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

Change-Id: I766c8ee1ac164ddc201adefab5e5a5c94a61d115