am 51e8df2e: am a001f7ae: Merge "Add carrier config variable to hide merge call button" into mnc-dr-dev

* commit '51e8df2ee64ba605e6695279a8aab987b2a56903':
  Add carrier config variable to hide merge call button