am 9ffb2351: am d4a395b0: Merge "Don\'t let touches in ConferenceManagerFragment fall through" into lmp-mr1-dev

* commit '9ffb2351bfdb83709b93699b9ee2cc6681866678':
  Don't let touches in ConferenceManagerFragment fall through
tree: b09721b6e066e4a812d0dfee8289ae7dbafbb134
  1. InCallUI/