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

Change-Id: Iaef848312f66cda20a8bdf902f46116005cd800d