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

Change-Id: I4f8f1b6fb133e2d4b0cbde1da872565aecffc86f