[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: 52012d23 am: a676e159 -s ours

am skip reason: Merged-In I0574091723aab1f6ab7406ae851cd44c11616f3e with SHA-1 58f76c37 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22216166



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