Merge "Update tests to include IMS attributes" am: c7bce185f1 am: c351b744e8

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1585187

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icd7539561dbcecbf37d252397026f1201282a4a0