[automerger skipped] Merge "Wait for IMS registration to be propogated in UCE stack" am: c85bb8e6a2 am: 6c8030a597 am: 2c0235478b -s ours

am skip reason: skip tag Change-Id I224fd3fc7dd124efe7dc15761267699c600c5d7e with SHA-1 72863a5c61 is already in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1646106

Change-Id: Idb9f973872cc22f4c61f583df84953a9d43d72f1