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

Change-Id: I4e86e5749ff19f40ba566b11b65db02abb58ca5b