Merge "Don't let touches in ConferenceManagerFragment fall through" into lmp-mr1-dev
tree: 4610f291dfcc8dc5abf78b55e7bb19c00b8d2d7e
  1. InCallUI/