[automerger skipped] Merge "Add the resetIms interface between framework and...

[automerger skipped] Merge "Add the resetIms interface between framework and ImsService." into udc-dev am: 8eedd452 am: a34df247 -s ours

am skip reason: Merged-In I673da788e9fcaf20b494f45d308d0456981b9e92 with SHA-1 ce241f2c is already in history

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



Change-Id: I2df02e8cb8a7dac4039d079e986f4aea5402d2b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>