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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cb615dd3bceee20b3fb43977a6792abc14302b4