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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535169

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94230a132833fae0e9b798260600c22794e04f77