[automerger skipped] Merge "Add a new method to unregister ImsFeatureStatusCallbacks" am: fe5f49d992 am: 8ac3df1468 -s ours

am skip reason: Change-Id I9826f25984510124317a5f271e83f9c0c81af3d3 with SHA-1 075ff3a0f9 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1344741

Change-Id: Ie8798db01485652292feb28fbac757d01f3f1e70