[automerger skipped] Merge "Move IMS tests back to opt/net/ims for better...

[automerger skipped] Merge "Move IMS tests back to opt/net/ims for better organization" am: ca6db0a8 am: 208870e3 -s ours am: 8331d352 -s ours am: db25c9d9 -s ours

am skip reason: Change-Id I6e74cad49a8010867dd78edf26c6526f872dd141 with SHA-1 f4763fd5 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1394169

Change-Id: I0660b0a928a170f3311e8d9735e8cad24af69e11