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

Change-Id: I5a6e5f69728ae04ad3d7dc5c5218f8db318bc41c