[automerger skipped] Merge "Update tests to include IMS registration feature...

[automerger skipped] Merge "Update tests to include IMS registration feature tags" am: 5459c466 am: da98f3bc am: 00a26335 -s ours

am skip reason: Change-Id Id9e9bd5e101323cb5a13f78d373420c37207744e with SHA-1 24c89ab6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7553a16fe18e0f8ec14c2b3e70e252f2daa24470