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

[automerger skipped] Merge "Move IMS tests back to opt/net/ims" into rvc-dev-plus-aosp am: 5a14ac54 am: 482209d0 am: dcb70571 -s ours

am skip reason: Change-Id I0e6e4ef4fb2d2042c317f8f7f8416cafa53ca6c6 with SHA-1 d5f4e0b7 is in history

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

Change-Id: I1529ec1d804002a15f166d022d06485436f061d6