[automerger skipped] Merge "Unit test for new ImsCallProfile extras and...

[automerger skipped] Merge "Unit test for new ImsCallProfile extras and methods" am: c5d41b74 am: cb918e6c am: bae3e89e -s ours

am skip reason: Change-Id Iae388f8497c26a5844b5d971e3708bf7c3817bfa with SHA-1 f2f12b86 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1535175

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a6ac6cafd6b0d1a8a80a07422bf7682759ae36a