Merge "Add Setting API to set/get enriched calling with call composer user option"