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

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

Change-Id: I30fff81d961c9084cd05d2ab5cf638086e0fc7c6