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

[automerger skipped] Merge "Move IMS tests back to opt/net/ims" am: b20630b9 am: 58871058 -s ours am: 271000dc -s ours am: d4241d77 -s ours am: dbbbafff -s ours

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

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

Change-Id: I1e216fbb9c42a41c70ec3ae2f7059f0f5fceff6f