am 1cb24df9: (-s ours) am 2c187a76: Remove voice key option from 7 inch tablet setting.

* commit '1cb24df91d637a4be11b11103ef5feca3a7237e8':
  Remove voice key option from 7 inch tablet setting.