Merge "Don't handle key events given to DocHolders of Message type." into nyc-andromeda-dev
am: b5d5966bc4

Change-Id: I4a2b1cc5bb4fbedbe12cc76da61a386a0f8e8fd7