Merge "Fix KeyEventInterceptTest fail" into rvc-dev am: c41bb27e88 am: 373272952d am: 47fe955271 am: 43b92ebd88

Change-Id: Ib6863b07f5023233447d0b02be920fd2731f4da1