[automerger skipped] Merge "Add Setting API to set/get enriched calling with call composer user option" am: 077cefb9 am: edeb75ca am: ac6339ae -s ours

am skip reason: Change-Id Iaf2cb72864dca992249395103aedee93ff8d3ac0 with SHA-1 ccc5af20 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I338c73b310d7025bbc6511caa5cb10218f4d64b3