Merge "Set default value of EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE true." am: f67a99fe60 am: a8cafc65ff

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I487626731aed71285fa359470b01e4227f5162c4