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

Change-Id: I5b67d6c1e9d7698232729a1ece66469373699408