Merge "When bg call does not support hold, auto-unhold on disconnect of fg call." into nyc-mr1-dev