[automerger skipped] Merge "Add a new method to unregister ImsFeatureStatusCallbacks" am: fe5f49d992 am: 8ac3df1468 -s ours am: 1cea4a7ac6 -s ours am: b996c10ca8 -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: I7da5ca56dce2a15c2d5a6bb1e94936ba0541a9c0