[automerger skipped] Merge "Update tests to include IMS attributes" am: c7bce185f1 am: c351b744e8 am: 4cf4fed30c -s ours

am skip reason: Change-Id I3535297797a519fd33d13089328b1520157c7bff with SHA-1 0b1f30230f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cf6cf5ed4ee099648bb3b2d179abb296bd0a620