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

Change-Id: I8daaf22e1859260fbd6ab21e38c3f6c569072aef