Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev am: 020212c7df am: ffe4d64182
am: 8455068d79

Change-Id: I89a175703e48400c06edef679e39aaec9366af9b