Merge changes from topic "revert_uce_dupe_req" into tm-dev am: 4fa51633

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/16980923

Change-Id: Id3160e4b9ab4f651aa7186261e49d197ab187c81