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

* commit 'd4a395b0c1c096804dd206d67ba168883e43bfd1':
  Don't let touches in ConferenceManagerFragment fall through
tree: c35a4ccced68809ec6721b369e3e87fa517cedc5
  1. InCallUI/